Drop ::configure-event

This signal is unused in GTK+ and configure events are handled
internally by GtkWindow.

If you need to catch configure events, the generic ::event
signal still works.

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 6119619524d6e74f82c8c9f9473c5951a36e9037..959d324ca97039b63e3fed210f9f3a13f5f8db6e 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -497,7 +497,6 @@ enum {
   KEY_RELEASE_EVENT,
   ENTER_NOTIFY_EVENT,
   LEAVE_NOTIFY_EVENT,
-  CONFIGURE_EVENT,
   FOCUS_IN_EVENT,
   FOCUS_OUT_EVENT,
   GRAB_BROKEN_EVENT,
@@ -1009,7 +1008,6 @@ gtk_widget_class_init (GtkWidgetClass *klass)
   klass->key_release_event = gtk_widget_real_key_release_event;
   klass->enter_notify_event = NULL;
   klass->leave_notify_event = NULL;
-  klass->configure_event = NULL;
   klass->focus_in_event = gtk_widget_real_focus_in_event;
   klass->focus_out_event = gtk_widget_real_focus_out_event;
   klass->drag_begin = NULL;
@@ -2131,34 +2129,6 @@ gtk_widget_class_init (GtkWidgetClass *klass)
   g_signal_set_va_marshaller (widget_signals[LEAVE_NOTIFY_EVENT], G_TYPE_FROM_CLASS (klass),
                               _gtk_marshal_BOOLEAN__OBJECTv);
 
-  /**
-   * GtkWidget::configure-event:
-   * @widget: the object which received the signal
-   * @event: (type Gdk.EventConfigure): the #GdkEventConfigure which triggered
-   *   this signal.
-   *
-   * The ::configure-event signal will be emitted when the size, position or
-   * stacking of the @widget's window has changed.
-   *
-   * To receive this signal, the #GdkWindow associated to the widget needs
-   * to enable the #GDK_STRUCTURE_MASK mask. GDK will enable this mask
-   * automatically for all new windows.
-   *
-   * Returns: %TRUE to stop other handlers from being invoked for the event.
-   *   %FALSE to propagate the event further.
-   */
-  widget_signals[CONFIGURE_EVENT] =
-    g_signal_new (I_("configure-event"),
-                 G_TYPE_FROM_CLASS (klass),
-                 G_SIGNAL_RUN_LAST,
-                 G_STRUCT_OFFSET (GtkWidgetClass, configure_event),
-                 _gtk_boolean_handled_accumulator, NULL,
-                 _gtk_marshal_BOOLEAN__OBJECT,
-                 G_TYPE_BOOLEAN, 1,
-                 GDK_TYPE_EVENT);
-  g_signal_set_va_marshaller (widget_signals[CONFIGURE_EVENT], G_TYPE_FROM_CLASS (klass),
-                              _gtk_marshal_BOOLEAN__OBJECTv);
-
   /**
    * GtkWidget::focus-in-event:
    * @widget: the object which received the signal
@@ -6338,6 +6308,7 @@ gtk_widget_emit_event_signals (GtkWidget      *widget,
        case GDK_DESTROY:
        case GDK_MAP:
        case GDK_UNMAP:
+       case GDK_CONFIGURE:
        case GDK_NOTHING:
          signal_num = -1;
          break;
@@ -6365,9 +6336,6 @@ gtk_widget_emit_event_signals (GtkWidget      *widget,
        case GDK_FOCUS_CHANGE:
          signal_num = event->focus_change.in ? FOCUS_IN_EVENT : FOCUS_OUT_EVENT;
          break;
-       case GDK_CONFIGURE:
-         signal_num = CONFIGURE_EVENT;
-         break;
        case GDK_GRAB_BROKEN:
          signal_num = GRAB_BROKEN_EVENT;
          break;

diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 872612892fdf584d2a6670371e2eb190715f935e..cb2b7b53cb17465e5589f04e3ddfb7730a025cfd 100644 (file)
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -208,8 +208,6 @@ struct _GtkWidget
  *   enters the widget’s window.
  * @leave_notify_event: Will be emitted when the pointer leaves the
  *   widget’s window.
- * @configure_event: Signal will be emitted when the size, position or
- *   stacking of the widget’s window has changed.
  * @focus_in_event: Signal emitted when the keyboard focus enters the
  * widget’s window.
  * @focus_out_event: Signal emitted when the keyboard focus leaves the
@@ -334,8 +332,6 @@ struct _GtkWidgetClass
                                         GdkEventCrossing    *event);
   gboolean (* leave_notify_event)      (GtkWidget           *widget,
                                         GdkEventCrossing    *event);
-  gboolean (* configure_event)         (GtkWidget           *widget,
-                                        GdkEventConfigure   *event);
   gboolean (* focus_in_event)          (GtkWidget           *widget,
                                         GdkEventFocus       *event);
   gboolean (* focus_out_event)         (GtkWidget           *widget,